Merge branch 'master' of git://git.denx.de/u-boot-arm
authorStefano Babic <[email protected]>
Tue, 16 Sep 2014 14:30:11 +0000 (16:30 +0200)
committerStefano Babic <[email protected]>
Tue, 16 Sep 2014 14:30:11 +0000 (16:30 +0200)

Trivial merge